Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 21 May 2010 12:26:07 +0000 (12:26 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 21 May 2010 12:26:07 +0000 (12:26 +0000)
commit44a4e9b5da4e5af3db6eb54ee5ba8b2f702cb2dd
treeda6d484b5c7eb10e88555cc76b839e26c4e859cb
parentfeeb9c6f5c7822413bd77d23145bf2053073270f
parenta3dcd89f986d1bfab2813db815c4b68a84dee75c
Merge from mainline.